projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e10158b 971b025)
bitkeeper revision 1.1236.44.1 (424336a973xtRANYgwC5MI9CGj9ddQ)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 24 Mar 2005 21:52:41 +0000 (21:52 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Thu, 24 Mar 2005 21:52:41 +0000 (21:52 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean

1  2 
xen/Makefile patch | diff1 | diff2 | blob | history

diff --cc xen/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.